From: Jan D <jan.h.d@swipnet.se>
Date: Mon, 16 Aug 2010 08:03:27 +0000 (+0200)
Subject: nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6948
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3eed92c28ae80920a45b503e58839862592d1c8d;p=emacs.git

nsselect.m: include keyboard.h for QPRIMARY, remove its declaration (Bug#6863).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ee9c047c04c..2fd2a804ce9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-16  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsselect.m: include keyboard.h for QPRIMARY, remove its
+	declaration (Bug#6863).
+
 	* xselect.c: Remove declaration of QPRIMARY (Bug#6864).
 
 	* keyboard.h (QPRIMARY): Declare (Bug#6864).
diff --git a/src/nsselect.m b/src/nsselect.m
index 23dede9c38e..fb1998a9799 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -33,10 +33,11 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 #include "lisp.h"
 #include "nsterm.h"
 #include "termhooks.h"
+#include "keyboard.h"
 
 #define CUT_BUFFER_SUPPORT
 
-Lisp_Object QPRIMARY, QSECONDARY, QTEXT, QFILE_NAME;
+Lisp_Object QSECONDARY, QTEXT, QFILE_NAME;
 
 static Lisp_Object Vns_sent_selection_hooks;
 static Lisp_Object Vns_lost_selection_hooks;